Keith Packard, X Consortium

Some bug fixes, but not clear from where.
